From ee768cf3010390da693766636a3f3048a04fab96 Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 31 Jan 2005 23:37:40 +0000 Subject: [PATCH] Frank Hippmann updates hsa_ndv.c to quote output with CDATA and updates MSVC build files. --- gpsbabel/hsa_ndv.c | 5 +- gpsbabel/msvc/GPSBabel.vcproj | 49 +++++ gpsbabel/reference/Glad_5.exp | 398 +++++++++++++++++----------------- gpsbabel/reference/hsandv.exp | 36 +-- 4 files changed, 268 insertions(+), 220 deletions(-) diff --git a/gpsbabel/hsa_ndv.c b/gpsbabel/hsa_ndv.c index 5fad20f30..d52452048 100644 --- a/gpsbabel/hsa_ndv.c +++ b/gpsbabel/hsa_ndv.c @@ -309,9 +309,8 @@ hsa_ndv_waypt_pr(const waypoint *waypointp) // fprintf(ofd, "\t\t\t0\n"); // fprintf(ofd, "\t\t\t1\n"); // fprintf(ofd, "\t\t\t1089009023\n"); - fprintf(ofd, "\t\t\tattr=grpnam%s\x1ftrnrad50\x1fOBJNAM%s\x1flegnum%i\x1fusrmrk%s\x1fselect2\n", - routeName, waypointp->shortname, legNum, waypointp->description); - fprintf(ofd, "\t\t\tattr=grpnam%s\x1f\n", routeName); + fprintf(ofd, "\t\t\t\n", routeName, waypointp->shortname, legNum, waypointp->description); + fprintf(ofd, "\t\t\t\n", routeName); fprintf(ofd, "\t\t\t1\n"); fprintf(ofd, "\t\t\t%lf\n", waypointp->latitude); fprintf(ofd, "\t\t\t%lf\n", waypointp->longitude); diff --git a/gpsbabel/msvc/GPSBabel.vcproj b/gpsbabel/msvc/GPSBabel.vcproj index 8d9f72aea..381f27301 100644 --- a/gpsbabel/msvc/GPSBabel.vcproj +++ b/gpsbabel/msvc/GPSBabel.vcproj @@ -186,6 +186,9 @@ BrowseInformation="1"/> + + + + + + + + + + + + + + + + @@ -1343,6 +1367,9 @@ BrowseInformation="1"/> + + + + + + + + + + + + + + + + 0 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMEdward Islandlegnum0usrmrkEdward Islandselect2 - attr=grpnamROUTENAME + + 1 -20.226667 149.205000 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMScawfell Islandlegnum1usrmrkScawfell Islandselect2 - attr=grpnamROUTENAME + + 1 - -20.850001 - 149.641668 + -20.850000 + 149.641667 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMMiddle Islandlegnum2usrmrkMiddle Islandselect2 - attr=grpnamROUTENAME + + 1 -21.680097 150.176053 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMClara Grouplegnum3usrmrkClara Groupselect2 - attr=grpnamROUTENAME + + 1 -22.318424 - 150.747717 + 150.747716 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMCape Capricornlegnum4usrmrkCape Capricornselect2 - attr=grpnamROUTENAME + + 1 - -23.448418 - 151.322717 + -23.448417 + 151.322716 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGladstone FWBlegnum5usrmrkGladstone FWBselect2 - attr=grpnamROUTENAME + + 1 - -23.890915 - 151.516051 + -23.890914 + 151.516050 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMHigh Peaklegnum6usrmrkHigh Peakselect2 - attr=grpnamROUTENAME + + 1 - -21.951660 - 150.754997 + -21.951659 + 150.754996 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMPenrith Islandlegnum7usrmrkPenrith Islandselect2 - attr=grpnamROUTENAME + + 1 - -20.988435 - 149.929386 + -20.988434 + 149.929385 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMPinnacle Pointlegnum8usrmrkPinnacle Pointselect2 - attr=grpnamROUTENAME + + 1 - -20.081094 - 149.064391 + -20.081093 + 149.064390 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMTink Shoallegnum9usrmrkTink Shoalselect2 - attr=grpnamROUTENAME + + 1 -19.375083 - 147.819368 + 147.819367 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMPeloruslegnum10usrmrkPelorusselect2 - attr=grpnamROUTENAME + + 1 -18.433464 - 146.549414 + 146.549413 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMEva Islandlegnum11usrmrkEva Islandselect2 - attr=grpnamROUTENAME + + 1 -18.213466 - 146.409415 + 146.409414 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMLittle Fitzroy Islandlegnum12usrmrkLittle Fitzroy Islandselect2 - attr=grpnamROUTENAME + + 1 -16.913473 - 146.059411 + 146.059410 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMCairns FWBlegnum13usrmrkCairns FWBselect2 - attr=grpnamROUTENAME + + 1 - -16.731976 + -16.731975 145.889412 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMLow Isleslegnum14usrmrkLow Islesselect2 - attr=grpnamROUTENAME + + 1 - -16.465145 + -16.465144 145.637746 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMPickersgill Reeflegnum15usrmrkPickersgill Reefselect2 - attr=grpnamROUTENAME + + 1 - -15.921815 + -15.921814 145.481079 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGubbinslegnum16usrmrkGubbinsselect2 - attr=grpnamROUTENAME + + 1 - -15.708467 - 145.382747 + -15.708466 + 145.382746 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMThree Isleslegnum17usrmrkThree Islesselect2 - attr=grpnamROUTENAME + + 1 - -15.110153 + -15.110152 145.402742 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMPalfreylegnum18usrmrkPalfreyselect2 - attr=grpnamROUTENAME + + 1 -14.673488 - 145.417741 + 145.417740 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMNymph Islandlegnum19usrmrkNymph Islandselect2 - attr=grpnamROUTENAME + + 1 -14.626822 - 145.251076 + 145.251075 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMCoquetlegnum20usrmrkCoquetselect2 - attr=grpnamROUTENAME + + 1 - -14.546824 - 145.061078 + -14.546823 + 145.061077 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMHowicklegnum21usrmrkHowickselect2 - attr=grpnamROUTENAME + + 1 - -14.483492 - 144.979412 + -14.483491 + 144.979411 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMMegaeralegnum22usrmrkMegaeraselect2 - attr=grpnamROUTENAME + + 1 - -14.483492 - 144.932746 + -14.483491 + 144.932745 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMWatsonlegnum23usrmrkWatsonselect2 - attr=grpnamROUTENAME + + 1 - -14.451826 - 144.902746 + -14.451825 + 144.902745 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMBarrowlegnum24usrmrkBarrowselect2 - attr=grpnamROUTENAME + + 1 -14.361826 - 144.686082 + 144.686081 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMRocky Pointlegnum25usrmrkRocky Pointselect2 - attr=grpnamROUTENAME + + 1 -14.195161 144.604414 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMPiponlegnum26usrmrkPiponselect2 - attr=grpnamROUTENAME + + 1 -14.138495 144.511082 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMKing Islandlegnum27usrmrkKing Islandselect2 - attr=grpnamROUTENAME + + 1 - -14.060164 - 144.331084 + -14.060163 + 144.331083 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMClack Islandlegnum28usrmrkClack Islandselect2 - attr=grpnamROUTENAME + + 1 -14.101829 144.244418 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMWharton Reeflegnum29usrmrkWharton Reefselect2 - attr=grpnamROUTENAME + + 1 -14.101831 - 143.977755 + 143.977754 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMEdenlegnum30usrmrkEdenselect2 - attr=grpnamROUTENAME + + 1 - -14.065165 - 143.917756 + -14.065164 + 143.917755 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMStainer Reeflegnum31usrmrkStainer Reefselect2 - attr=grpnamROUTENAME + + 1 -13.981832 143.834422 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMPelicanlegnum32usrmrkPelicanselect2 - attr=grpnamROUTENAME + + 1 - -13.915167 - 143.812756 + -13.915166 + 143.812755 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMMagpielegnum33usrmrkMagpieselect2 - attr=grpnamROUTENAME + + 1 -13.815167 143.734423 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMFifelegnum34usrmrkFifeselect2 - attr=grpnamROUTENAME + + 1 - -13.656835 + -13.656834 143.704422 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMHeath Reeflegnum35usrmrkHeath Reefselect2 - attr=grpnamROUTENAME + + 1 - -13.475170 - 143.671089 + -13.475169 + 143.671088 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMBow Reeflegnum36usrmrkBow Reefselect2 - attr=grpnamROUTENAME + + 1 -13.341836 - 143.671089 + 143.671088 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMOsbornelegnum37usrmrkOsborneselect2 - attr=grpnamROUTENAME + + 1 -13.096838 143.611087 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMChapmanlegnum38usrmrkChapmanselect2 - attr=grpnamROUTENAME + + 1 -12.886839 143.594420 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMWye Reeflegnum39usrmrkWye Reefselect2 - attr=grpnamROUTENAME + + 1 -12.818506 143.586087 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMEel Reeflegnum40usrmrkEel Reefselect2 - attr=grpnamROUTENAME + + 1 -12.415159 143.362754 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMPiperlegnum41usrmrkPiperselect2 - attr=grpnamROUTENAME + + 1 -12.236844 143.247755 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMMoodylegnum42usrmrkMoodyselect2 - attr=grpnamROUTENAME + + 1 -12.085178 143.239421 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMClerkelegnum43usrmrkClerkeselect2 - attr=grpnamROUTENAME + + 1 - -11.963513 - 143.317754 + -11.963512 + 143.317753 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMHanniballegnum44usrmrkHannibalselect2 - attr=grpnamROUTENAME + + 1 - -11.586850 - 142.981089 + -11.586849 + 142.981088 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMHalfwaylegnum45usrmrkHalfwayselect2 - attr=grpnamROUTENAME + + 1 -11.378517 142.986088 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMCairncrosslegnum46usrmrkCairncrossselect2 - attr=grpnamROUTENAME + + 1 -11.231851 - 142.954422 + 142.954421 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMWybornlegnum47usrmrkWybornselect2 - attr=grpnamROUTENAME + + 1 -10.806855 142.804421 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMAlbany Rocklegnum48usrmrkAlbany Rockselect2 - attr=grpnamROUTENAME + + 1 - -10.741856 + -10.741855 142.676089 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMAlpha Rocklegnum49usrmrkAlpha Rockselect2 - attr=grpnamROUTENAME + + 1 -10.601857 142.552756 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMHerald Patcheslegnum50usrmrkHerald Patchesselect2 - attr=grpnamROUTENAME + + 1 - -10.501859 - 142.377759 + -10.501858 + 142.377758 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMEast Strait Leadslegnum51usrmrkEast Strait Leadsselect2 - attr=grpnamROUTENAME + + 1 -10.480192 - 142.334426 + 142.334425 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMShadwell Pointlegnum52usrmrkShadwell Pointselect2 - attr=grpnamROUTENAME + + 1 - -10.495193 - 142.282760 + -10.495192 + 142.282759 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMNardanalegnum53usrmrkNardanaselect2 - attr=grpnamROUTENAME + + 1 -10.508525 - 142.251094 + 142.251093 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMHammondlegnum54usrmrkHammondselect2 - attr=grpnamROUTENAME + + 1 - -10.510193 - 142.202761 + -10.510192 + 142.202760 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMHarrisonlegnum55usrmrkHarrisonselect2 - attr=grpnamROUTENAME + + 1 - -10.561860 + -10.561859 142.126094 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMB1legnum56usrmrkB1select2 - attr=grpnamROUTENAME + + 1 - -10.568518 - 141.909434 + -10.568517 + 141.909433 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMRed Bankslegnum57usrmrkRed Banksselect2 - attr=grpnamROUTENAME + + 1 - -10.829183 - 141.659174 + -10.829182 + 141.659173 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMDuyfken Ptlegnum58usrmrkDuyfken Ptselect2 - attr=grpnamROUTENAME + + 1 -12.568516 141.501109 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMWeipa Leadslegnum59usrmrkWeipa Leadsselect2 - attr=grpnamROUTENAME + + 1 -12.705000 141.661667 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMWeipa FWBlegnum60usrmrkWeipa FWBselect2 - attr=grpnamROUTENAME + + 1 -12.700000 141.688333 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGannetlegnum61usrmrkGannetselect2 - attr=grpnamROUTENAME + + 1 -10.590757 141.875120 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMB2legnum62usrmrkB2select2 - attr=grpnamROUTENAME + + 1 -10.575158 141.891066 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMMid Decaplegnum63usrmrkMid Decapselect2 - attr=grpnamROUTENAME + + 1 -14.965864 145.407427 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMTurtlelegnum64usrmrkTurtleselect2 - attr=grpnamROUTENAME + + 1 -14.632647 - 145.189251 + 145.189250 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMNewtonlegnum65usrmrkNewtonselect2 - attr=grpnamROUTENAME + + 1 - -14.517176 - 144.911975 + -14.517175 + 144.911974 diff --git a/gpsbabel/reference/hsandv.exp b/gpsbabel/reference/hsandv.exp index 78c979a7d..0f3b43070 100644 --- a/gpsbabel/reference/hsandv.exp +++ b/gpsbabel/reference/hsandv.exp @@ -6,72 +6,72 @@ 0 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGCEBBlegnum0usrmrkMountain Bike Heaven by susy1313select2 - attr=grpnamROUTENAME + + 1 35.972033 -87.134700 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGC1A37legnum1usrmrkThe Troll by a182pilot & Familyselect2 - attr=grpnamROUTENAME + + 1 36.090683 -86.679550 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGC1C2Blegnum2usrmrkDive Bomber by JoGPS & familyselect2 - attr=grpnamROUTENAME + + 1 35.996267 -86.620117 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGC25A9legnum3usrmrkFOSTER by JoGPS & Familyselect2 - attr=grpnamROUTENAME + + 1 36.038483 -86.648617 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGC2723legnum4usrmrkLogan Lighthouse by JoGps & Familyselect2 - attr=grpnamROUTENAME + + 1 36.112183 -86.741767 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGC2B71legnum5usrmrkGanier Cache by Susy1313select2 - attr=grpnamROUTENAME + + 1 36.064083 -86.790517 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGC309Flegnum6usrmrkShy's Hill by FireFighterEng33select2 - attr=grpnamROUTENAME + + 1 36.087767 -86.809733 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGC317Alegnum7usrmrkGittyUp by JoGPS / Warner Parksselect2 - attr=grpnamROUTENAME + + 1 36.057500 -86.892000 waypnt - attr=grpnamROUTENAMEtrnrad50OBJNAMGC317Dlegnum8usrmrkInlighting by JoGPS / Warner Parksselect2 - attr=grpnamROUTENAME + + 1 36.082800 -86.867283 -- 2.30.2